…lated density. Now gives same result for N or NO3.

Conflicts:
	mytest/Goldsack_101.sel
	mytest/NaNH4K_ClBrSO4_101.sel

It looks like you may be committing a merge.
If this is not correct, please run
	git update-ref -d MERGE_HEAD
and try again.

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.

On branch viscosity
Your branch is up to date with 'origin/viscosity'.

All conflicts fixed but you are still merging.

Changes to be committed:
	modified:   examples/ex1.out
	modified:   examples/ex10.out
	modified:   examples/ex10.sel
	modified:   examples/ex11.out
	modified:   examples/ex12.out
	modified:   examples/ex12a.out
	modified:   examples/ex13a.out
	modified:   examples/ex13ac.out
	modified:   examples/ex13b.out
	modified:   examples/ex13c.out
	modified:   examples/ex14.out
	modified:   examples/ex14.sel
	modified:   examples/ex16.out
	modified:   examples/ex17.out
	modified:   examples/ex17b.out
	modified:   examples/ex18.out
	modified:   examples/ex19.out
	modified:   examples/ex19b.out
	modified:   examples/ex2.out
	modified:   examples/ex21.out
	modified:   examples/ex22.out
	modified:   examples/ex2b.out
	modified:   examples/ex3.out
	modified:   examples/ex4.out
	modified:   examples/ex5.out
	modified:   examples/ex5.sel
	modified:   examples/ex6.out
	modified:   examples/ex7.out
	modified:   examples/ex7.sel
	modified:   examples/ex8.out
	modified:   examples/ex9.out
	modified:   mytest/H2S_71C.out
	modified:   mytest/H2S_Amm.out
	modified:   mytest/H2S_numerical.out
	modified:   mytest/H2S_sit.out
	modified:   mytest/H_K.out
	modified:   mytest/KinSorbNp.out
	modified:   mytest/MassWater.out
	modified:   mytest/MethEthPropIsotopes.out
	modified:   mytest/Na2SO4_phr.out
	modified:   mytest/NaK_ClBr.out
	modified:   mytest/PR_EQ_GP.out
	modified:   mytest/Vm0_tc.out
	modified:   mytest/Vm_NH4Cl_sol.out
	modified:   mytest/Vm_salt.out
	modified:   mytest/Vm_salt_65.out
	modified:   mytest/Vm_salt_fig.out
	modified:   mytest/all_llnl.out
	modified:   mytest/asf.out
	modified:   mytest/colloid_U.out
	modified:   mytest/colt1.out
	modified:   mytest/colt2.out
	modified:   mytest/colt3.out
	modified:   mytest/colt4.out
	modified:   mytest/colt5.out
	modified:   mytest/densities.out
	modified:   mytest/dump_test.out
	modified:   mytest/ex12.out
	modified:   mytest/ex12_101.sel
	modified:   mytest/ex17mp.out
	modified:   mytest/ex17mp_101.sel
	modified:   mytest/feb.out
	modified:   mytest/febmp.out
	modified:   mytest/i3.out
	modified:   mytest/kinetic_rates.out
	modified:   mytest/kinetic_rates_101.sel
	modified:   mytest/kinetic_rates_plus.out
	modified:   mytest/kinetic_rates_plus_101.sel
	modified:   mytest/llnl.out
	modified:   mytest/millero.out
	modified:   mytest/millero_101.sel
	modified:   mytest/minteq.out
	modified:   mytest/minteqv4.out
	modified:   mytest/missing_surf_related_kin.out
	modified:   mytest/netpathxl.out
	modified:   mytest/netpathxl_101.sel
	modified:   mytest/np.test.out
	modified:   mytest/np.testmp.out
	modified:   mytest/num_spread.out
	modified:   mytest/oxygen.out
	modified:   mytest/oxygenmp.out
	modified:   mytest/phi_CO2-CH4_GP.out
	modified:   mytest/phreeqc.test.out
	modified:   mytest/phreeqc.test_101.sel
	modified:   mytest/phrqpitz.tst.out
	modified:   mytest/phrqpitz.tst_101.sel
	modified:   mytest/pitzalphas.out
	modified:   mytest/pitzalphas_101.sel
	modified:   mytest/rate_parameters.out
	modified:   mytest/rate_parameters_101.sel
	modified:   mytest/rate_xmpls.out
	modified:   mytest/rate_xmpls_101.sel
	modified:   mytest/rho_CaNaCl.out
	modified:   mytest/rho_MgCaCl.out
	modified:   mytest/rho_MgNaCl.out
	modified:   mytest/rotter.out
	modified:   mytest/run_cells.out
	modified:   mytest/run_cells_101.sel
	modified:   mytest/saver.out
	modified:   mytest/saver_101.sel
	modified:   mytest/sc6.out
	modified:   mytest/sc6a.out
	modified:   mytest/sc6b.out
	modified:   mytest/sc7.out
	modified:   mytest/seaw_SC.out
	modified:   mytest/sit_edl.out
	modified:   mytest/sit_edl_101.sel
	modified:   mytest/sit_redox.out
	modified:   mytest/sit_redox_101.sel
	modified:   mytest/surf_related_warnings.out
	modified:   mytest/surf_related_warnings_101.sel
	modified:   mytest/t2.out
	modified:   mytest/ternary.out
	modified:   mytest/test_sit.out
	modified:   mytest/tn_KBr.out
	modified:   mytest/tn_KBr_101.sel
	modified:   mytest/y_H2O.out
	modified:   mytest/zeta.out
	modified:   mytest/zeta_101.sel